Merge "Fix mismatch between isSupported & allocate"