holoirc: more backport work