AERO-1407

Owned by yumgry@dA