merge in master-release history after reset to 0e70545227c3f20f3cc5759e8b93562b1c277251