Script for TC19345
Merge branch 'origin/TC19345'