@Agiri@masto.ninja you should be able to set our repo as a remote and cherrypick those changes off it without staying in our mainline i think