Integrated changes by Umesh