Hi Julie,

thanks for tracking this down! Your plan sounds good to me, we do need that Horizon patch backported to bring stable/folsom branch back in shape.

Cheers,
Alan