Temporary fix for KT-5912

  #KT-5912 Fixed