Merge "Accept strings for more parameters in Suspend Dialog" into sc-dev