Merge fixes 1.2