[V1S5 - US10] Server side authorizations
Merge branch 'S5-US10'