Issue #2201735 by drkloc: Adding patch to ref_field to avoid warning