merged upstream v5.41