Merge branch with release
 - updated change log