Fix case when datatable false
Merge remote-tracking branch 'origin/master'