switch to own fuji-common