AERO-2381

Owned by R_ben@TH