add isEmptyDate check
Merge branch 'develop' into material_develop