updating to upstream 042stab093.4