Merge branch 'jt/t5500-unflake'