Fixed a bug
component.ui returns UI instead of Option[UI]
Merge remote-tracking branch 'upstream/3.0' into 3.0-navigator
merge upstream/3.0