Fixed bug #16000: Move versioning selector to the version extension