merge fixes from deploy branch