Merge with master + merge fixes