holoirc: inital backport to GB