Re Fix: CATS-1120