Merge branch 'fix-exclude-dir-with-iface' into release-3.14

Merge-request: !2937