new class
Merge commit '512c1c28d61511572de074ee4ccb3c4717da5d69'