* Revert "Revert "Reland pass filesystem options (#15622)" (#15651)"

This reverts commit 0f3eada0.

* Fix for windows failing test

* !isEmpty -> isNotEmpty