MODE-2005 Additional tests and fixes for the versioning behavior
MODE-2005 Additional fixes for merging.