Merge "Update API usage for mergable transitions" into sc-dev