FL-1209: avoid duplication