Merge branch 'issue-533-prepare-release' (#533)