Merge tag '1.0.17' into develop

1.0.17