AERO-1249

Owned by lunsyy@dA