merged upstream v5.32