AERO-2391

Owned by vponpo@dA