merge in master-release history after reset to 2fc72d1c0294fb759380604ea906ce67ebeb5c5f