core - Revision 18242: /branches/PersistenceOverhaul