Merge "Chore: Update global-jjb to latest v0.85.0"