A mix of FMU and Interface changes in this commit.