Merge branch 'main' into 1328-issue-when-computing-bwe_exc_extended