Merge "Move Path to NAR" into pi-dev