FS-6094 --resolve amendment