fixed #bf-54 - xf:submission use xf:resource from in lined xf:load
Merge remote-tracking branch 'origin/development' into development