merge experimental into new_features