Merge "Update global-jjb to v0.21.1"