Merge "MMS API cleanup (1/4)" into lmp-dev