Squashed and rebased to current: Jeff's 3x + nick fixups of the 3x