Merge "Update global-jjb to v0.36.0"