FS-5416 --resolve just missing the part that registers it
FS-5325 force rebuild