merge in master-release history after reset to 3ced06906759b3ce252e114fcc9c98fa36228911