Merge tag '1.18' into OO