Merge "Add ability to make transitions not replaceable" into main