remove if else for same return
Merge pull request #4243 from samsonasik/fix/ifelse.remv

remove if else for same return
Merge branch 'hotfix/4243' into develop

Forward port #4243
replaced get_called_class() with get_class($this) in non-static context
Merge branch 'hotfix/4246' into develop

Forward port #4246