Revision 13176 from xe-trunk