CS-4921: Fixes stupid typo
CS-4921: Fixes wrong merge