SPI-2547: update flake and friends See merge request !2214
mentioned in commit 09aee65c
mentioned in commit c0280238
mentioned in commit 66630654