* Reverts #7865, keeping class names on the same line * Add changelog * Fix lint * Fix Co-authored-by: fisker Cheung <lionkay@gmail.com>
:
Co-authored-by: Georgii Dolzhykov <thorn.mailbox@gmail.com>