Merge release/2.26.0 branch into develop branch
#2841
Merged
release/2.26.0 branch into develop branch
#2841