Disable path w/o play no.
Normalize step
Merge branch 'fix/routing'

reviewed by @irxground