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