Merged fixes from reconciliation_print_statements