AERO-1377

Owned by vponpo@dA