Merge "Rework authorization controller "