fix
Merge branch 'hotfix/fix_admin_spot_generator'