Merge remote-tracking branch 'origin/update-jar' into autostaging