added state master
Merge branch 'lv_dev'