Merge bugfix into release branch