AERO-2467

Owned by vponpo@dA