Merge branch 'main' into basop-2492-remove-duplicates-for-decode_indexes-function