Bug fixes
Code deduplication
Fix crashes with multimodule applications
Test case
Merge pull request #1982 from sjinks/1.3.0

Fix crashes with multimodule applications