Merge pull request #4965 from tano-systems/pr/20210406-disable-routes-support