holoirc: finish GB backport work