- Merge remote-tracking branch 'remotes/origin/main' into...

- Merge remote-tracking branch 'remotes/origin/main' into basop-2296-ivas_jbm_dec_tc-remove-unused-code
- remove nested compilation switches