#DEMO-42 demo project changes