12.0 fix restrinctions

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

Merge request reports