AERO-2507

Owned by bajanbing@dA