ignite-sprint-6: merge from ignite-1011
23 files changed