Merge branch 'jc/doc-push-satellite' into next