Merge with fixes