Merge branch...

Merge branch 'basop-2641-fix_basop_2563_crash_hq_generic_dec-not-active-or-cleaned-properly' into 'main'

Clean out FIX_BASOP_2563_CRASH_HQ_GENERIC_DEC set active, as intended

See merge request !3092