Merge remote-tracking branch 'jaimeMF/opus-fix'