SPI-1882: Apply the feynhiggs patch also for clang11 and higher builds
Closes SPI-1882
See merge request !728 (merged)