Merge branch 'ph3-module-support'

1 job for master in 44 seconds (queued for 1 second)