Closes FLX-2487
assigned to @fschreud
enabled an automatic merge when the pipeline for 501c5a2b succeeds
mentioned in commit 633cd873
merged