Eng 6857

Agree we can do same for AuthGroup as well.