ENG-6635 @UAC drop index fix