AERO-2508

Owned by pxcarats@dA