Merge branch 'main' into 124-hplcinfo-handle-in-decoder