merge in master-release history after reset to df3914b04c07300558751aba9e7a05474474739a