Add assertions to transition system
Merge changes from release branch