Merge commit '4a7ab6c24ccaefb21ac8b502e3d7f92dbd9bbae3' * commit '4a7ab6c24ccaefb21ac8b502e3d7f92dbd9bbae3': update the authtoken permission granting UI