2.18 version updates