merging changes in release to master