Merge commit 'origin/403_versioning_cleanup'