update .18 support for -rc6