Merge "Allow MmsConfig override per request (1/3)" into lmp-dev