Merge "BUG-5192: FRM skips reconciliation"