1.6 update

This reverts commit 438ab613

Merge request reports

Loading