Merge "TIF: A preliminary CL to add multiple rating systems" into lmp-dev