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

Forward port #4246