Last merge for 1.55 (Intrusive)