Merge branch 'main' into rotation_in_SHD_testing