[ticket/416] Allow multiple inclusions of portal modules

Fixes #416