Revert "revert f6e7ce94bf010ab1a97a5511e6c8cb5afc05aa8e, testing was not done in time so thie issue was pulled from the patch"

This reverts commit 72d8a8e1b0ff59d59ff89d3aec6811fb32cab1c0.
KFSPTS-3659 Add code change after code review