Merge branch 'master' into always-report-exceptions-v2