module exists fix
Merge pull request #3030 from obrignoni/2.3/develop

module exists fix
Improving search
Merge branch 'refs/heads/2.3/develop' into 3.0/develop