SCRUM-44 #closenot Co-authored-by: Phan Huy Tran <ptran@noreply.localhost> Reviewed-on: #6 Co-authored-by: Jan Klattenhoff <jan@kjan.de> Co-committed-by: Jan Klattenhoff <jan@kjan.de>