Merge branch 'update/admin-fe-stable' into 'maint/1.1'