Merge branch 'ping-vlive'