Merge branch 'cherry-pick-eaf1f258' into '1.4-dev'

Merge branch '6142-the-filter-for-configuration-is-wrong-in-fusiondirectory-setup' iMerge branch '6142-the-filter-for-configuration-is-wrong-in-fusiondirectory-setup' innto '1.4-dev'

See merge request fusiondirectory/fd!856