Merged -b dev-structure-and-transitions