12.0 employee settings

Merged Sebastian Kennedy requested to merge 12.0-employee-settings into 12.0-stage

Merge request reports