Dynamic module follow-ups

[jukie]

Tracking #8579 (comment)

[github-actions]

This issue has been automatically marked as stale because it has not had activity in the last 30 days.