merge in master-release history after reset to 8e085cbeccb1138d52a0a423af02e6ab41b4fee4