Merge branch 'foreign/josef/space-updates' into for-chris-4.6