ALU-1851

Owned by catko@TH