merge in master-release history after reset to bf701a1a92937ee7caa01d2df05a1ecd641cade1