Merge branch 'main' into feature/music-visualization-template