Merge "When using a custom start/ end make sure to correctly calculate the distance" into lmp-dev