am cf6125c2: Improving performance of state transitions

* commit 'cf6125c2d30ce02d8ab6cbe8e37a20f6a831e216':
  Improving performance of state transitions