Drug issue

Merged Piotr Gawron requested to merge drug-issue into devel_12.1.x

Merge request reports