Closes RTSD-82
requested review from @kooistra
assigned to @donker
mentioned in commit ef19a04f
merged