Fix preflight errors backport

Backport of fix for issue #180 (closed)

Merge request reports

Loading