Merge pull request #2386 from mdjunior/master

Handling path_length when ca is True