Merge branch '1905_versioning_fix'