Some last minute sync

[ci skip]