Returned to more declarative page embeds.
Merge branch 'develop'
Cleanup.
Merge branch 'develop'
Cleanup.
Moved some files.
Merge branch 'feature/modular' into develop
Merge branch 'develop'