merge in master-release history after reset to 1e0d82fdb15231d881d94c51f5eb1b30abd4b045