Merge "Add options for custom paths." into pi-dev