Merge from the 5.3 branch (security fix). Tagged as merge_53_src, merge_53_dst, merge...