Changes done for TC12424