Draft: Resolve "ICB: rebuild trajectory simplification and speedup"

Closes #231

Merge request reports