Merge "Fix UI build"