MOD move some code from controller to service See merge request !4
FIX some conflicts See merge request !3