AERO-2252

Owned by sworadver@dA