This commit removes unnecessary main-branch merges starting from 8750608b5b and adds the following needed commit(s) that were made afterward: - 5dce82c48b
8750608b5b
5dce82c48b
Closes gh-13407
Closes gh-13403
Closes gh-12974