merge fixes from experimental branch