merge in master-release history after reset to 0d085404af53e47b2bb193102d0f1a6c07ba8797