Merge changes from topic '15921'