merge in master-release history after reset to e4e9dc65f1cc9d1984ea356951de283b0866bdc4