[-> 5604] Update to Revision 5604