Merge pull request #1476 from tnull/2022-05-maximum-path-length