Merged profile templates correctly + sample roles tab