cfo-repo - Revision 16035: /shorten/trunk