AERO-1695

Owned by vponpo@dA