Merge branch 'open_state'