Merge remote-tracking branch 'origin/main' into 1721_fix_activated_hp20_recoding