Improved error message occurred while accessing uninitialized field in entity
Added support for null and empty string in default values
Merge branch 'release-v2.1.0' into develop