Merge main
changes to develop
to prepare for 3.66.0
#1389
Merged
main
changes to develop
to prepare for 3.66.0
#1389