826512, 828388, 828394, 828412, 843143 removing ua-override
Merge pull request #11123 from karlcow/master

826512, 828388, 828394, 828412, 843143 removing ua-override