[base] Revision 331219