ESDEV-889 Port Sepa bug fix to development branch Fixing test cases (cherry picked from commit 3e1be4d) (cherry picked from commit 35e16f6)
ESDEV-889 Port Sepa bug fix to development branch Fixing test cases (cherry picked from commit 53f4fd1) (cherry picked from commit 19ef5ed)