Merge branch 'master' into 383874-ArtifactFS-JAR-support