merge in master-release history after reset to e026fac8868f7393ccab2ce4ceb8faa9bd2530b2