Migration to 2.6 #1246
last merge conflict