Merge changes from topic '35521'