Finish Upstream Merge

Merge final cherry picks from v0.5.0