This Part of the Commit is related to changes made by kanchan.