merge in master-release history after reset to f9ab6a71f8629aea16a815a2acadafe9c053c2e7