Changes in 4.1 codebase - Part2