merge in master-release history after reset to 2f3dca149a2bcae96f18e38f7ba99a95c3e1b08c