Closes FLX-2484
assigned to @fschreud
enabled an automatic merge when the pipeline for 6c5732f4 succeeds
mentioned in commit 9e3b451b
merged