Edits round 1#12

tgerke wants to merge 6 commits intostopsack:devstopsack/risks:devfrom

tgerke:t-editstgerke/risks:t-editsCopy head branch name to clipboard