AERO-1389

Owned by vinsm0ker@dA