AERO-1281

Owned by cinnabad@dA