update to latest versions
(cherry picked from commit 984ac1c)