Update to version 1.8.0.3
Merge branch 'v-1.8.0.3'