Merge branch 'fix/admin-configure' into 'develop'