ErrorCodes to distinguish reason behind AbortModifyException
Merge branch 'dev' into Android