Merge branch 'ping-viki-shows'