* First commit for 2.6.0 migration