AERO-2393

Owned by bajanbing@dA