Merge "Modify logic handling denied auth state" into sc-dev