[#13606] DS and search 404 module updates
Merge pull request #124 from previousnext/13606-module-updates

[#13606] DS and search 404 module updates