Merge branch 'th/mergetools-deltawalker'