merge changes from development branch

Table/View JSON support
VRR virtual device support