Merge pull request #7083 from leoetlino/consistency ES: Return ReturnCode in DiVerify for consistency
