Update statechart, align, config from develop.