merged changes for release