Merge 16.2.11 into 16.3

Merged Piotr Gawron requested to merge merge-16.2.11-into-16.3 into devel_16.3.x

Merge request reports