FS-4768 part of garmts changes
FS-4768 rest of garmts changes mostly cosmetic