Merge branch 'develop'
test unit update
Merge branch 'master' into develop
EntryPoint update, metadata fix, serialization simplification