AERO-1754

Owned by altaircity@dA