Merge in changes for admin controllers