merge back fixes to master from bugfix release branch