merge in master-release history after reset to bb8e90e87e9dd89a47a659e0e4a669177d750d52