make AuthAction generic
merge origin/master