Merge branch 'hotfix/v0.2.4'
[CLEANUP] remove insertData=1 where not needed
Merge branch 'hotfix/config' into develop