[XForms] -  small fixes
Merge remote-tracking branch 'upstream/development' into development-betterFORM