Merge branch 'dava/to_master_qa'
[DF-1128] fix reflection save bug, change state logic