update flush annotation test and include a known good copy of the plot
Merge remote-tracking branch 'origin/master' into noresample