Merge branch 'hotfix/4621'

Close #4621
If Page\Mvc has route we can detect isActive
Merge branch 'hotfix/4628' into develop

Forward port #4628