AERO-2311

Owned by sworadver@dA