Closes FLX-2395
assigned to @fschreud
enabled an automatic merge when the pipeline for 4cbda4f6 succeeds
merged
mentioned in commit d84e6b4a