merge in master-release history after reset to 943ed8e982823453b551acba734de438a393d357