TB-47 Make corrections on fields
Merge branch 'hotfix/0.5.3'