#318227 Clean up update abort logic to more clearly explain what still needs to be done, a little more clarification.