Merge/patch fixes.