AERO-2234

Owned by sworadver@dA