merge in master-release history after reset to e370094aedc7d529ab30d5bac8ad48b1ebe57897