Merge branch 'main' into 598-be-re-insert-assert-to-catch-out-of-memory-access-in-the-ind_list-buffer