Original "Add expansion_notify callback" patch