Merge branch 'fix-none-path'

2 jobs for rpcv6 in 8 minutes and 17 seconds (queued for 1 second)