[3.8] Fix some prod issues

- Fix #1217
- Fix #1212
- FIx #1208
- Fix feed controllers binding