Hybrid refresh/replay fixes
Merge pull request #784 from khawkins/hybrid_refresh

Hybrid refresh/replay fixes