Merge changes from topic '14855'