Hotfix: check also the owner value.
Merge branch 'hotfix' into develop