merge in master-release history after reset to b31f33b5e41bf295705b8f0c1582c6277e8fec64