FS2-2461: replace scatterplots with combined scatter #31

Closed JustinCCYap closed 3 months ago