Manual report of commit 18a3a66a6a23ed757d3a63e409e83974d81beffe from 1_x