Merge "Fixed out of sync suspended state" into sc-dev