Merge "Refactor Telecomm framework classes into actual framework"