merge in master-release history after reset to ee7b2d0c5ee560ec48ff0f82b1beed3f71d8bbfd