Merge branch 'master' into develop
Hotfix: check also the owner value.
Hotfix - Fixed undefined variable notice.
Merge branch 'hotfix'