Merge fixes / improvements