Merge "Fix IndexOutOfBoundsException in process start timeout" into sc-dev