Merge branch '6149-acl-on-search-field-are-not-working-as-expected' into '1.4-dev'

Resolve "ACL on search field are not working as expected"

See merge request fusiondirectory/fd!867