MB-7478: Identify few more trouble cases