Merge pull request #210 from dhongu/14.0-edi-check

Merge pull request #210 from dhongu/14.0-edi-check #588