WL-2604 Safety office courses
Merge branch 'WL-2604' into WL-2603