upstream contributions

Authored and co-authored

Reported