AERO-2231

Owned by bajanbing@dA