Merge "Updates to admin utils"