Merge changes from topic '72816'