Merge tag '1.0.13' into develop

version 1.0.13
a
Merge branch 'release/1.0.14'