FOC/L4RE: Upstream revision 47