AERO-1732

Owned by lory-draws@dA