merged upstream v5.56