Merge branch 'tr/merge-unborn-clobber'