AERO-2283

Owned by exist_maybe@TH