Merge branch 'master' into develop
Hotfix: check also the owner value.
Merge remote-tracking branch 'origin/hotfix'