merge: Heavenly spec overhaul. (#2563)