#13839: Sync back with upstream tarball


PR for issues #13839