AERO-2259

Owned by sworadver@dA