Merge fixes 1)