I just merged the latest 8.x-1.x in this branch so that I can test it.