Merge branch 'cb/t4201-robustify' into maint