AERO-1727

Owned by azelfion@dA