merged fixes from dev, stress passed