Build #8993:   Merge branch 'maint-0.3.5' into maint-0.4.3 "ours" to avoid version bump. on branch maint-0.4.3 over 4 years ago