AERO-2312

Owned by sworadver@dA