fix form mapping definition
Merge branch 'master' into 2.3