rmi-sidebar
Merge branch 'fac-layout-jr' into fac-layout