Merge branch 'release/1.1'
fix
Merge branch 'hotfix/datatable_no_data_fix' into develop