Fixed a case when only local pool rewrites are present
Merge branch 'develop'