Upgrading code to current FW/1 (2.5rc1) and DI/1