Merge updates for FFOS + other modifications