Included a small fix, the first not from our papers, to provide better behavior with ASYNC reconciliation.
Does not affect the default SYNC reconciliation.