MODE-2005 Additional fixes for merging.