Closes CWG-68
requested review from @kliffen and @feldt
approved this merge request
merged
mentioned in commit db1748cc