Merge "When performing a long jump, update SP last." into lmp-dev