Upstream 20140317 rev 3886