Merge branch 'fix-none-path'

3 jobs for master in 8 minutes and 12 seconds (queued for 2 seconds)