Merge branch 'backport-3.31-file-MAKE_DIRECTORY-result-var' (early part)