Hotline#12812

Ghost User requested to merge hotline#12812 into hotline_6.40

Merge request reports