AERO-2545

Owned by rylanbean@dA