KFSPRJQ-307 changes from code reivew