Merge "Drop support for indirect draws on ES"