NEXUS-5790: Adjusted master changes.