Backport 5.3 changes to 5.2

This should work out of the box, as there shouldn't be any major nDisplay changes between 5.2 and 5.3.

Merge request reports

Loading