KFSTI-682 Eliminating inline service retrieval and calls