AERO-1658

Owned by vponpo@dA