Add setting for en/disabling orphan field checks