core - Revision 18242: /branches/2747_CFSAP