Merge branch 'michel_2879_reql_admin_3' into michel_2879_reql_admin