The rest of patches from Jan merged.