Merge few bug-fixing branches into branch-1.13.2