Merge "Final structural tweaks to Telecomm API (1/8)" into lmp-dev