This is all based on 2.0.6 only. Besides, we don't really know what will happen on 2.1 live. PTR keeps changing and they might change their minds, who knows. If EP remains the way it is in the current iteration of PTR, will have to make changes for sure.