Merge branch 'maint' into backport-master