AERO-2212

Owned by bajanbing@dA