Closes L2SDP-1059
requested review from @kooistra
assigned to @kooistra
enabled an automatic merge when all merge checks for df5fb44b pass
canceled the automatic merge
mentioned in commit 0bc68570
merged