Fixes #3740

Should be ordered according to number and type and should have your github nickname.