Replacement steps use full covariance by default. Option to use diagonal approximation.
Merge branch 'two-replacement-types' into develop