CRA-505: Copied in changes from pre-split.