Merge branch 'feat/us34-department-address' into 'dev'

feat/US34-department-address

See merge request !109
3 jobs for dev in 4 minutes and 29 seconds (queued for 2 seconds)