Merge with the main repository: develop

Refactoring to resolve filename conflicts and some literals