AERO-2469

Owned by R_ben@TH