Merge branch 'lyrics-fix' into aarmea-dev