[imp][33529] Let FOF work with Content History (Fix #3375)