Merge "Status: Don't raise "abort" as error to the user"