Sampler update for 2.4.0-pre.1