Fix binding states for DSM
Merge branch 'master' into app_end_hang