Merge tag 'little-fixes' into develop

v1.63
state_machine
some refactoring
Merge branch 'release/state_machine'

* release/state_machine:
  some refactoring
  state_machine