Merge branch 'pt/t0302-needs-sanity'