AERO-1392

Owned by cresom@dA