Merge "Patches to known issues"