Merge branch 'maint-0.3.5' into maint-0.4.4

"ours" to avoid version bump.
8 jobs for maint-0.4.4 in 17 minutes and 38 seconds (queued for 63 minutes and 54 seconds)
latest