Backport IFRC fixes