Fixing broken merge conflict resolution
Merge branch 'master' into authorization