KFSPTS-3644 : changes made for KFS-65 review.