Introduce include_by_default field property