Merge "Add property contexts for vts props"