AERO-2452

Owned by rylanbean@TH