Manual update from 1.8.19 to 1.8.20.5.
Merge branch 'release/1.8.20.5'