Merge user_name claim changes from master