Deprecated in favor of PoiUtil in middleware
Merge remote-tracking branch 'origin/master'