merge conflicts between 3.43.0 and 3.45.1
merge conflicts between 3.26.0 and 3.34.0
merge conflicts.