FS-2731 apply patch