Merge "Ignore instead of throw errors in QuittingState and reorder some parameters."