Merge "Upgrade to global-jjb v0.48.1"