Resolve TMSS-715

Closes TMSS-715

assigned to @schaap

added 87 commits

• 76ec9203...4f78bc65 - 86 commits from branch master
• 4e19870f - Merge branch 'master' into TMSS-715

Compare with previous version

enabled an automatic merge when the pipeline for 4e19870f succeeds

merged

mentioned in commit 4f68cd2e