Scatterplot  Update for #3473

Rebased Code for Scatterplot targetting bug #3473