Merge remote-tracking branch 'frento/flake' into flake
Merge remote-tracking branch 'ospalh/flake' into flake
A bit re-flaking.
Finish reflakeing of this changes.