KFSTI-524 changes per pull request review