AERO-2383

Owned by bajanbing@dA