holoirc: more GB backport work