AERO-2278

Owned by bajanbing@dA