merge in master-release history after reset to 7474df8b7027b929e1666129628bb858a422e004