Merge branch 'hotfix/fix_format_loyalty'
fix
Merge branch 'hotfix/fix_admin_spot_generator' into develop