Update to 18.0
Merge branch 'f17' into ipos1