AERO-1054

Owned by ronictm@dA