Merge "Fix typo that leads to attention not working" into rvc-d1-dev