Merge remote-tracking branch 'origin/static-tags' into autostaging
Merge branch 'update-jars' into autostaging