upgrade to RELEASE_3_18