Resolve "Backport #3111: FLQ fix"

Razvan Becheriu requested to merge 3143-backport-3111-flq-fix into v2_4

Merge request reports