Merge tag 'v1.0.38' into develop

v1.0.38 - implemented support for tag based fields
Merge branch 'release/1.0.39'