Merge "Fix the PMS live computer" into sc-dev