Initial commit for proto-2013-01