Fixed project
Merge remote-tracking branch 'origin/master' into VS-Feature-BatchJPAtestdata