Merge changes from topic "change-112626-6"