Merge branch 'ignite-1.5.2' into ignite-1.5.3