[COOK-2182] - fix FC043 and FC019
Merge branch 'COOK-2182'