AERO-1274

Owned by beacant@dA