Merge branch 'riyafa/VXQUERY-211'