APP-210 some refactoring of abort feature