FS-4123 --resolve slightly modified patch applied