Cpz 72

Merged Joel Maglioni requested to merge CPZ-72 into 15.0

Merge request reports