Resolve LAB-252

Merged Javier Vescio requested to merge LAB-252 into 12.0

Closes LAB-252

Merge request reports