AERO-1349

Owned by vponpo@dA