If nHeight is zero, use the newer protocol.
Merge branch 'future_drift_v2' into mystuff