Merged with latest commits made by Praveen