merge v1.3.23 (surface)