Changes done for TC12422