New PR after merge conflicts
Merge branch 'vibe13-demo2' into demo2