ESDEV-889 Port Sepa bug fix to development branch Fixing comments (cherry picked from commit 894ad97)