FW-279. Adapting SW to new FW organization.