Merge branch 't/opus'