FS2-2461: use combined scatter with a flag #33

Closed JustinCCYap closed 3 months ago