merge in master-release history after reset to 5e4c4f12337ff4d7ceb105bcd441bb7aea6ab070