Merge branch 'foreign/qu/norecovery-v7' into for-chris-4.6