replaced get_called_class() with get_class($this) in non-static context
Merge branch 'hotfix/4233'

Close #4233
Fixes #4214
Merge pull request #4246 from prolic/get_class_fix

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

Forward port #4246