Merged with Revision 68