Updated legacy version to 4.8.9/5.1.9 (cherry picked from commit a9b5159)