scripts: sync with master

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

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