12.0 fix domain

Merged Sebastian Kennedy requested to merge 12.0-FIX-domain into 12.0-stage

Merge request reports