Resolve KAS-18

Merged Ignacio Goitea requested to merge KAS-18 into 11.0-stage

Closes KAS-18

Merge request reports