Fix some bug after prod delivery, #288

Merge request reports

Loading