Merge "Disable profile enabled check (API is changing)"