refs #29624 #29623
Merge branch 'features/admin-layout2' of https://github.com/aipocom/aipo into features/admin-layout2