FS-4883 --resolve I can add this but if it leads to issues in the loaded code we may not have resoures to investigate