AERO-2431

Owned by ronictm@dA