Feature/du594 upgrade to 1.6