Only show modules that are enabled

Something is wrong with the module model - restriction is not applied (cache?)
Merge branch 'refs/heads/2.3/develop' into 3.0/develop