sync up with v3.17.x

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>