Merge "[BUGFIX] Extbase does not restrict queries to use only properties"