AERO-0748

Owned by vponpo@dA