Last patch didn't completely fix the sub-profile inheritance issue
Merge pull request #489 from jimi1283/miscimprovements

Last patch didn't completely fix the sub-profile inheritance issue