* fix for issue #4927
Signed-off-by: denis-tingaikin <denis.tingajkin@xored.com>

* apply review comments
Signed-off-by: denis-tingaikin <denis.tingajkin@xored.com>

* apply review comments
Signed-off-by: denis-tingaikin <denis.tingajkin@xored.com>