Merge branch 'jk/t5516-deflake' into maint