fixed Entity and Form
fixed
Merge branch 'master' into 2.5