Commits 3c9d98a: Add missing type decls when merging (Chris Penner) #6264 d5e6e31: run checks (Chris Penner) #6264