Merge branch 'PTPS_Controller_8' into PTPS_Controller_9