Merge pull request #5020 from leoetlino/es-safer-import IOS/ES: Implement ES_AddTitleCancel (and slightly safer import process)
