Merge remote-tracking branch 'remotes/origin/ignite-1157' into ignite-1.3.3