Updated from 1.8.16 to 1.8.18.
Merge branch 'release/1.8.18'