Merge branch 'hotfix/syntax_again'
Merge branch 'release/v1.5.2'
fixed bug in data-table
Merge branch 'hotfix/fix-data-table' into develop