Merge branch 'v2.18.5-release'
Merge branch 'master' into 2.20-Oct-19