Merge "Initial implementation of merge-able transitions" into sc-dev