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