Merge "Delete sampler optimization." into jb-mr2-dev