updating to upstream 042stab092.3