backport patch mecanism