Merge fixes for develop branch, XFORM story : CORE-2