UC-666 - fix bad merge