Closes TMSS-951 & TMSS-1001
Merge details
Closed TMSS-951
· Mentions issue TMSS-1001
enabled an automatic merge when the pipeline for 9e20b80c succeeds
merged
mentioned in commit a16bea6f