Merge Sampler and Bootcards changes