Regenerate from develop branch