Merge branch 'ignite-993' into ignite-1.3.3-p7