Merge branch 'hotfix/4632'

Close #4632
Fixes #4552
Can't return false whithout call parent::isActive
Merge branch 'hotfix/4634' into develop

Forward port #4634