Merge remote-tracking branch 'iilyak/2585-allowed_owner-hook'

This closes #3