finish-release

Complete and merge release branch