[#28820] Adds Module Filter
Merge pull request #368 from previousnext/28820-module-filter

[#28820] Adds Module Filter