Merge branch '3gpp_issue_1303_fix_and_optimizations' into 'main'

Partial fix for 3GPP issue 1303: Obvious spectral discrepencies between... [allow regression]

See merge request !1211