AERO-1628

Owned by aengoes@dA