Issue #5981: Sync -x 3.3