Merge "Cleanup the PM Computer class" into sc-dev