merge in master-release history after reset to 9cba0f12682eadc0d297468fd547847c2f99e4b5