Develop fw 310

Fixing FW-310.