AERO-1366

Owned by cruelranch@dA