AERO-2489

Owned by bajanbing@dA