Arrow point to current checkpoint or origin if no checkpoints exist.
Merge remote-tracking branch 'origin/AH-320_Demo_6' into update_arrow_to_checkpoint
Merge remote-tracking branch 'origin/AH-320_Demo_6' into update_arrow_to_checkpoint