Merge "Fixed possible NPE in flow reconciliation"