ADF - Revision 3177: /branches/2.5.0b - closed