upstream 1.5.2