bug fixes from 11.0.4 into 11.1.x

Merged Piotr Gawron requested to merge devel_11.0.x into devel_11.1.x

Merge request reports