AERO-1411

Owned by sworadver@dA