merge the changes by mahirkukreja in testcm11 branch