AERO-1317

Owned by vponpo@dA