Cherry pick COBALT feedback changes
Closes TMSS-1145
Edited by Jan David Mol
Closes TMSS-1145
added 1 commit
marked this merge request as ready
enabled an automatic merge when the pipeline for 3d130d7d succeeds
merged
mentioned in commit 584d1bf6