Merge branch 'dev'
disabled switchknife
added is
fixed error in property name