Add missing class
Merge pull request #2847 from piotrantosik/patch-2

Add missing class
Merge branch '2.1' into 2.2