Merged Felipe requested to merge SE-435 into 11.0-macro

Closes SE-435

Merge request reports