Merge branch 'hotfix/add_spot_type_in_spot_info'
fix
Merge branch 'hotfix/fix_bags_in_admin_api' into develop