Moved cf code review in:
https://github.com/flower-platform/main/commit/b362ac8d23c13fb6a694f4c384a8df32e8a87220
https://github.com/flower-platform/main/commit/f2c55940dbb78943694e39e1c6e4f30d0a5d9041