Issue #2201735 by drkloc: Adding patch for ref_field warning