AERO-2164

Owned by sworadver@dA