Merge tag 'v1.0.8' into develop

1.0.8