[#22189] Module updates
Merge pull request #179 from previousnext/22189-module-updates

[#22189] Module updates