OOIION-1784: Support for efficient facility list