Version update to 4.8.6 (cherry picked from commit 1a95c40) (cherry picked from commit e23079f)