merge in master-release history after reset to 191e3b707ab96107c0e043e4fc99ad37e5eda13e