Sync w/ master patches.