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