Like wih gitlab configs, this does only pure merge. We will
slaposify / adjust to updates in the following patches.

/cc @kazuhiko, @jerome