Migration 2.6 #1246

Task ID: #1246