Merge pull request #2538 from karolina-telicent/prefixes-service

GH-2543: Prefixes service