Hi,

this PR is an attempt to fix #20050 which causes the specific modules not to be deployed.

Let me know what you think. Cheers, Christoph