As for 18, I'll check that after you merge the changes in 27. I'll migrate 18 to the new files.