CSPACE-5763: Fix merge that went awry.
CSPACE-5763: Fix additional merge SNAFU.