SFS-2791

Range of changes to handle updates made to SFS 5.8