Merge "Intercepted transition keeps previous distance" into main