Merged the latest changes for Release_2; bug fixes
Updated ChangeLog.txt