The merge has already happened. The generic preview is going to be in 1.18 (early 2022).