Sync w/ master-patches.