Replacing reference to is_profile
Merge branch 'master' into ent_types_frontend