Bug 5992 - GBP + SFC integration is broken