Merge branch 'ignite-960' into ignite-sprint-6