Preparation for explicit loss handling (and catchup for xls missing commit)