Issue #5981: Sync the latest build