RAACMS-45 admin structure stable
Merged from master.