Merge "Fix problem with empty profiles."