Fixup

changes made in fsm-highstate-function-graph are being added via this intermediary branch because something funky is happening with that branch and this was the way I could make sure to get the changes into release-next