Merge changes from topic '10422'