Comment about timeouts in the FSM
Convert to logging instead of using println
Merge upstream changes