Merge branch 'main' into...

Merge branch 'main' into 1046-wmc-tool-incorrectly-reports-complexity-when-wmops_detail-is-activated