Merge branch 'master' into authenticate
added comment for admin user
added comment