AERO-2339

Owned by tealssalt@TH