Merge branch 'sam_2563_sindex_block' into sam_2563_ii
Merge branch 'sam_2563_ii' into sam_2563