Upstream 1.5.22

Upstream changes since last sync up to 1.5.22.