revision 879 to v3.2.2