Added all changes since template integration.