Merge branch 'demo_removal' into custom
Fixing a indentation error