ENG-6777 resolved the error
(cherry picked from commit 13c7cccecf34169491fff078d34471a4f2def3ad)