[seba_dos1]

There's nothing scary about conflicts on cherry-picked commits. It's just sometimes tedious to resolve them one-by-one, and sometimes may just not be worth the effort if it can be done in a better way.