fix: align with zingo_common_components
#229
+389
−240
Merged