Merge with UI Dev branch to add redesigned Fusion UI. (v3.2.0)