AERO-2251

Owned by sworadver@dA