Use fj_core::Instance
in more places
#2192
Merged
fj_core::Instance
in more places
#2192