Merge branch 'no-kill-gate' into dt-test