case 3711 - Dependencies and important rules cleanup.
Merge branch 'case-3711' into develop
Merge branch 'develop'