Added pathlib
support and resolved conflicts.
#1731
pioneerHitesh:pathlib-final% was force-pushed and no longer has any new commits.
Pushing new commits will allow the pull request to be re-opened.