added fixes and add support of Changelog

Change-Id: Ia3052b80eb9135dfeee3427b45d1b706bd9dd6de