Draft: Forward propagate dev/5.3 changes into 5.4

Merge request reports

Loading