Begin changes to transition to FSO 3.0 platform