7.22

Wrapping in a number of pending fixes along with 7.22 from upstream.