All of anderson's code in this commit. yeah.
Merge remote-tracking branch 'modli/feature/edge-availability-path-expander' into feature/edge-availability