Merge "Refactoring into Telecomm Codebase and cleanup"