Merge remote-tracking branch 'origin/ignite-1.3.3-p3' into ignite-1.3.3-p3