merge fixes for experimental toggle