Merge branch 'refs/heads/t/opus_cleanup'