Merge branch 'master' into validate_sarif