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