Merging MAster+Sakthi with Jeyam july 26th changes