Updated to v 1.3.8
Merge branch 'release/v1.3.8' into develop