Merge branch '16824'