Merge branch 'fix-typo-when-patching-trace' into 'master'

Kamil Trzcińskirequested to merge
cherry-pick-3b5b8337 into 1-4-stable

Fix abort mechanism when patching trace

See merge request !262 (merged)

Merge request reports