Re-generated the kitchensink archetype from the quickstart
Merge branch 'develop' into release-4.3.1.Final-1