Merged latest changes from github-release