TFJ-832 re-introduce includeEntitiesEnabled parameter