AERO-1329

Owned by danzerker@dA