That Menu, those tests....
Merge branch 'smartAdminSetup'