feat: decouple x/capability
from simapp
#12256
+203
−104
Merged