This MR is related to the MR !29699 (merged) which failed sweeping in master
adding @nkoehler and @rosati