a little optimization for the saturation flag checking stage
Merge remote-tracking branch 'origin/elk-new-incremental' into elk-new-incremental
add missing @Override