Merge "Update Global-jjb to master"