Release v1.958 (based on 1887747)