CRA-505: Copied in changes from pre-split.
CRA-505: Copied in changes from pre-split, merged with Erik.