Bug 20434: Add missing fields