Merge "Update to global-jjb v0.22.1"