Merge branch 'push-sideband' into stable-0.7