AERO-2379

Owned by tracycreates@dA