Merge branch 'exp-hash' into exp-fsm