AERO-2254

Owned by sworadver@dA