Adding warnings before automatic upgrade
Merge branch 'admin' into testing