Merged logpro-abort-check into v1.60/28 but abort not quite right yet