Add core patch that somewhat supports sub-profiles