Add override check for admin template info
Merge branch 'refs/heads/master-update'