Promote from dev to branch 2.40.