AERO-1284

Owned by bajanbing@dA