FUL-103 - fix merge issue on FUL-121