Follow up on TMSS-1254
Processed @mol 's late but valid review comments on MR !660 (merged)
Had to make a new merge request (this one), to merge the edits into master.
Processed @mol 's late but valid review comments on MR !660 (merged)
Had to make a new merge request (this one), to merge the edits into master.