Upstream 20130302 rev 3622