Merge branch 'hotfix/add_demo_spot'
fix
fix
Merge branch 'hotfix/fix_config' into develop