Adding workaround for MNG-5146