Merge "Add flag for transition cause/effect plumbing work" into main