Fix: hydrate components that return null
#3873
+10
−1
Merged
null
#3873