Fixed really broken core recipes due to GT fix.
Merge remote-tracking branch 'origin/lc-1.6' into lc-1.6