Fixes Endpoint sorting class.
Merge commit '69fae260500d4a18351415879a2c5297a5ffb912' into HEAD