Closes FLX-1428 and FLX-2426
enabled an automatic merge when the pipeline for 6c9cb171 succeeds
merged
mentioned in commit c76754ad