merging dev to test#1000

ffrose wants to merge 2 commits into

testbuerokratt/Service-Module:testfrom

devbuerokratt/Service-Module:devCopy head branch name to clipboard