merge in master-release history after reset to 981c9422b470e268d1debce9a8e8a2521b67744f