Copying trunk version 18639 into a geni branch