Merge "Merge branch 'distance-with-t-bug'"