BACKPORT TO GB DEVICES