New feature profile stuff; refactoring (bug 917738)