PLT/main improvements

(cherry picked from commit e634eb52)

Merge request reports

Loading