Merge remote-tracking branch 'origin/hh6chen-dijkstras-with-reverse' into hh6chen-dijkstras-with-reverse