CB-6570 - Ffos contacts fix